Switch build-system to distutils

Plus lots of updates to make the build succeed

diff --git a/debian/rules b/debian/rules
index c1cb6526f56bebb01b06f81b0203d0cf922f6b03..2da808186af3fc5625978f34de60bb58d2d2feb8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,63 +10,108 @@ endif
 ifeq ($(shell ls debian/lib* | grep -- -$(PYSIDE_MAJOR)),)
     $(error Please update files debian/lib*.* for major version $(PYSIDE_MAJOR))
 endif
-# FIXME parallel building seems to fail
-# ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-#     OPTION_JOBS = --parallel=$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-# endif
 
 # don't set PYBUILD_NAME because we want the installed files to land in
 # debian/tmp and then get split up into the feature packages.
-export PYBUILD_SYSTEM = cmake
-export PYBUILD_BUILD_ARGS = -j1
+export PYBUILD_SYSTEM = distutils
 
 export MAIN_VERSION_UPSTREAM := $(shell echo $(DEB_VERSION_UPSTREAM))
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 # Add CPPFLAGS to CXXFLAGS as CMake ignores CPPFLAGS by default
 CXXFLAGS+=$(CPPFLAGS)
 
+export LLVM_INSTALL_DIR := $(shell llvm-config --prefix)
+
 # Work around buildd bug (https://bugs.debian.org/842565)
 undefine XDG_RUNTIME_DIR
 
-_BUILDDIR = $(shell pybuild -p `py3versions -dv` --print {build_dir})
-export PYTHONPATH = $(_BUILDDIR)/sources
+
+PYBUILD_BUILD_ARGS = --skip-packaging
+PYBUILD_INSTALL_ARGS = --reuse-build --skip-packaging
+
+## Package compilation options
+
+# 1. if sccache is installed then use it
+
+SCCACHE := $(shell command -v sccache 2> /dev/null)
+
+ifdef SCCACHE
+  SCCACHE_DIR ?= $(HOME)/.cache/sccache
+  export SCCACHE_DIR
+  PYBUILD_BUILD_ARGS = --compiler-launcher=sccache
+execute_before_dh_auto_build:
+       -sccache --start-server
+endif
+
+# 2. support 'nocheck' builds - building and running the tests is slow
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+  PYBUILD_BUILD_ARGS += --build-tests
+endif
+
+# 3. support 'nodoc' builds - building the docs just needs lots of extra deps
+ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+  PYBUILD_BUILD_ARGS += --build-docs
+endif
+
+
+export PYBUILD_BUILD_ARGS
+export PYBUILD_INSTALL_ARGS
+
+
 
 %:
-       dh $@ --with python3,sphinxdoc --buildsystem=pybuild --no-parallel
+       dh $@ --buildsystem=pybuild
 
-# FIXME ignore build failure and attempt to continue
-override_dh_auto_build:
-       dh_auto_build --buildsystem=cmake --builddirectory=$(_BUILDDIR) -- -j1 || true
+execute_after_dh_auto_build:
+       # Record build in build index for test runner
+       TODAY=`date -Id`; \
+       mkdir -p build_history/$$TODAY; \
+       echo $$PWD > build_history/$$TODAY/build_dir.txt; \
+       py3versions -d >> build_history/$$TODAY/build_dir.txt \
 
 execute_after_dh_auto_install:
        # Obtain a list of files built to make it easier to update *.install files.
-       echo ">>> In .pybuild"
-       -find $(_BUILDDIR)
+       # dh_missing will check all the install files at the end
+       echo ">>> In build"
+       -find build
        echo ">>> In debian/tmp"
        -find debian/tmp
 
 override_dh_makeshlibs:
        dh_makeshlibs -VUpstream-Version
 
-override_dh_install-indep:
-       dh_install -X.doctrees
+override_dh_installdocs-indep:
+       dh_installdocs -X.doctrees
+       find debian -name __pycache__ -type d -exec rm -rf {} +
 
 execute_after_dh_install-arch:
-       # remove RUNPATH setup in shiboken6
-       chrpath -d debian/shiboken6/usr/bin/shiboken6
-       # change the library path in pkg-info/*.pc and in *.cmake files:
-       # during the build the path is setup to the build dir
-       # /build/pyside6* (required to find lib during the build) but it's
-       # not what we need
+       # remove RUNPATH from libraries and executables
+       # only look at files not symlinks
+       find debian/*/usr/lib/ -name \*.so* -type f -exec chrpath -d {} \;
+       chrpath -d \
+         debian/*/usr/lib/python3*/dist-packages/PySide6/Qt/libexec/*
+       chrpath -d \
+         debian/*/usr/lib/python*/dist-packages/PySide6/assistant \
+         debian/*/usr/lib/python*/dist-packages/PySide6/designer \
+         debian/*/usr/lib/python*/dist-packages/PySide6/linguist
+
+       # remove executable permissions
+       find debian/pyside6-tools/usr/lib/python3*/dist-packages/PySide6/scripts/ -type f -exec chmod a-x {} +
+
+       # fix up various paths in .pc, cmake and __init__.py
        debian/set-paths
 
-# FIXME suppress test failure as build has not succeeded
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 ifeq (mips64el,$(DEB_HOST_ARCH))
        # See https://bugs.debian.org/868745
+       PIP_BREAK_SYSTEM_PACKAGES=1 \
        QSG_NO_DEPTH_BUFFER=1 xvfb-run -a dh_auto_test -- --system=custom \
-               --test-args '{interpreter} testrunner.py test'
+               --test-args '{interpreter} testrunner.py test --buildno=-1'
 else
+       PIP_BREAK_SYSTEM_PACKAGES=1 \
+       QTWEBENGINE_CHROMIUM_FLAGS="--disable-gpu --no-sandbox" \
        xvfb-run -a dh_auto_test -- --system=custom \
-               --test-args '{interpreter} testrunner.py test' || true
+               --test-args '{interpreter} testrunner.py test --buildno=-1'
+endif
 endif